From: Joakim Verona Date: Thu, 15 Aug 2013 18:46:44 +0000 (+0200) Subject: merge from trunk X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=28bfe2167958a42d2974f3466db5193c385ce3cd;p=emacs.git merge from trunk --- 28bfe2167958a42d2974f3466db5193c385ce3cd